merge trunk
authorK. Handa <handa@gnu.org>
Wed, 4 Sep 2013 11:56:57 +0000 (20:56 +0900)
committerK. Handa <handa@gnu.org>
Wed, 4 Sep 2013 11:56:57 +0000 (20:56 +0900)

Trivial merge